--- a/mail/test/browser/moz.build
+++ b/mail/test/browser/moz.build
@@ -38,34 +38,16 @@ BROWSER_CHROME_MANIFESTS += [
     'tabmail/browser.ini',
     'utils/browser.ini',
 ]
 
 DIRS += [
     'shared-modules',
 ]
 
-TESTING_JS_MODULES.mozmill += [
-    '../resources/mozmill/mozmill/extension/content/modules/controller.jsm',
-    '../resources/mozmill/mozmill/extension/content/modules/elementslib.jsm',
-    '../resources/mozmill/mozmill/extension/content/modules/events.jsm',
-    '../resources/mozmill/mozmill/extension/content/modules/frame.jsm',
-    '../resources/mozmill/mozmill/extension/content/modules/init.jsm',
-    '../resources/mozmill/mozmill/extension/content/modules/jum.jsm',
-    '../resources/mozmill/mozmill/extension/content/modules/mozmill.jsm',
-    '../resources/mozmill/mozmill/extension/content/modules/utils.jsm',
-    '../resources/mozmill/mozmill/extension/content/stdlib/arrays.jsm',
-    '../resources/mozmill/mozmill/extension/content/stdlib/dom.jsm',
-    '../resources/mozmill/mozmill/extension/content/stdlib/EventUtils.jsm',
-    '../resources/mozmill/mozmill/extension/content/stdlib/httpd.jsm',
-    '../resources/mozmill/mozmill/extension/content/stdlib/os.jsm',
-    '../resources/mozmill/mozmill/extension/content/stdlib/securable-module.jsm',
-    '../resources/mozmill/mozmill/extension/content/stdlib/strings.jsm',
-]
-
 TEST_HARNESS_FILES.testing.mochitest.fakeserver += [
     '../../../mailnews/test/fakeserver/auth.js',
     '../../../mailnews/test/fakeserver/imapd.js',
     '../../../mailnews/test/fakeserver/maild.js',
     '../../../mailnews/test/fakeserver/nntpd.js',
     '../../../mailnews/test/fakeserver/pop3d.js',
     '../../../mailnews/test/fakeserver/smtpd.js',
 ]

rename from mail/test/resources/mozmill/mozmill/extension/content/stdlib/EventUtils.jsm
rename to mail/test/browser/shared-modules/EventUtils.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/stdlib/arrays.jsm
rename to mail/test/browser/shared-modules/arrays.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/modules/controller.jsm
rename to mail/test/browser/shared-modules/controller.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/stdlib/dom.jsm
rename to mail/test/browser/shared-modules/dom.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/modules/elementslib.jsm
rename to mail/test/browser/shared-modules/elementslib.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/modules/events.jsm
rename to mail/test/browser/shared-modules/events.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/modules/frame.jsm
rename to mail/test/browser/shared-modules/frame.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/stdlib/httpd.jsm
rename to mail/test/browser/shared-modules/httpd.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/modules/init.jsm
rename to mail/test/browser/shared-modules/init.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/modules/jum.jsm
rename to mail/test/browser/shared-modules/jum.jsm

--- a/mail/test/browser/shared-modules/moz.build
+++ b/mail/test/browser/shared-modules/moz.build
@@ -1,30 +1,45 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TESTING_JS_MODULES.mozmill += [
     'AccountManagerHelpers.jsm',
     'AddressBookHelpers.jsm',
+    'arrays.jsm',
     'AttachmentHelpers.jsm',
     'CloudfileHelpers.jsm',
     'ComposeHelpers.jsm',
     'ContentTabHelpers.jsm',
+    'controller.jsm',
     'CustomizationHelpers.jsm',
+    'dom.jsm',
     'DOMHelpers.jsm',
+    'elementslib.jsm',
+    'events.jsm',
+    'EventUtils.jsm',
     'FolderDisplayHelpers.jsm',
+    'frame.jsm',
+    'httpd.jsm',
+    'init.jsm',
+    'jum.jsm',
     'JunkHelpers.jsm',
     'KeyboardHelpers.jsm',
     'MessageHelpers.jsm',
     'MockObjectHelpers.jsm',
     'MouseEventHelpers.jsm',
+    'mozmill.jsm',
     'NewMailAccountHelpers.jsm',
     'NNTPHelpers.jsm',
     'NotificationBoxHelpers.jsm',
+    'os.jsm',
     'PrefTabHelpers.jsm',
     'PromptHelpers.jsm',
     'QuickFilterBarHelpers.jsm',
     'SearchWindowHelpers.jsm',
+    'securable-module.jsm',
+    'strings.jsm',
     'SubscribeWindowHelpers.jsm',
+    'utils.jsm',
     'WindowHelpers.jsm',
 ]

rename from mail/test/resources/mozmill/mozmill/extension/content/modules/mozmill.jsm
rename to mail/test/browser/shared-modules/mozmill.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/stdlib/os.jsm
rename to mail/test/browser/shared-modules/os.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/stdlib/securable-module.jsm
rename to mail/test/browser/shared-modules/securable-module.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/stdlib/strings.jsm
rename to mail/test/browser/shared-modules/strings.jsm

rename from mail/test/resources/mozmill/mozmill/extension/content/modules/utils.jsm
rename to mail/test/browser/shared-modules/utils.jsm

deleted file mode 100644
--- a/mail/test/mozmill/.eslintrc.js
+++ /dev/null
@@ -1,13 +0,0 @@
-"use strict";
-
-module.exports = {
-  globals: {
-    __file__: true,
-    collector: true,
-    elementslib: true,
-    mozmill: true,
-  },
-  rules: {
-    "func-names": "off",
-  },
-};

deleted file mode 100644
--- a/mail/test/mozmill/Makefile.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(moztopsrcdir)/config/rules.mk
-
-# We're installing to _tests/mozmill
-_DEST_DIR = $(DEPTH)/_tests/mozmill
-
-$(_DEST_DIR):
-	$(NSINSTALL) -D $@
-
-
-# Copy MozMill and its dependencies over, and set up a virtualenv. The
-# virtualenv directory is outside because we don't want to bundle it up during
-# stage-package.
-VIRTUALENV_DIR = $(topobjdir)/_virtualenvs/init
-mozmill-virtualenv: $(_DEST_DIR)
-	unset MACOSX_DEPLOYMENT_TARGET && \
-	$(PYTHON) $(_DEST_DIR)/resources/installmozmill.py $(VIRTUALENV_DIR)
-
-ifndef MOZ_AUTOMATION
-# We don't run mozmill tests as part of the build in automation, so skip
-# creating a virtualenv for them.
-libs:: mozmill-virtualenv
-endif
-
-PKG_STAGE = $(DIST)/test-stage
-
-stage-package:
-	$(NSINSTALL) -D $(PKG_STAGE)/mozmill/
-	$(NSINSTALL) -D $(PKG_STAGE)/mozmill/fakeserver
-	$(NSINSTALL) -D $(PKG_STAGE)/mozmill/resources
-	@(cd $(commtopsrcdir)/mail/test/mozmill && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mozmill/ && tar -xf -)
-	@(cd $(DEPTH)/_tests/mozmill/fakeserver && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mozmill/fakeserver && tar -xf -)
-	@(cd $(DEPTH)/_tests/mozmill/resources && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mozmill/resources && tar -xf -)

deleted file mode 100644
--- a/mail/test/mozmill/account/test-ab-whitelist.js
+++ /dev/null
@@ -1,162 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-var mozmill = ChromeUtils.import(
-  "chrome://mozmill/content/modules/mozmill.jsm"
-);
-var controller = ChromeUtils.import(
-  "chrome://mozmill/content/modules/controller.jsm"
-);
-var elib = ChromeUtils.import(
-  "chrome://mozmill/content/modules/elementslib.jsm"
-);
-
-var {
-  click_account_tree_row,
-  get_account_tree_row,
-  open_advanced_settings,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/AccountManagerHelpers.jsm"
-);
-var {
-  assert_equals,
-  assert_false,
-  assert_true,
-  FAKE_SERVER_HOSTNAME,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
-);
-
-var { MailServices } = ChromeUtils.import(
-  "resource:///modules/MailServices.jsm"
-);
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-var gOldWhiteList = null;
-var gKeyString = null;
-
-var gAccount = null;
-
-function setupModule(module) {
-  let server = MailServices.accounts.FindServer(
-    "tinderbox",
-    FAKE_SERVER_HOSTNAME,
-    "pop3"
-  );
-  gAccount = MailServices.accounts.FindAccountForServer(server);
-  let serverKey = server.key;
-
-  gKeyString = "mail.server." + serverKey + ".whiteListAbURI";
-  gOldWhiteList = Services.prefs.getCharPref(gKeyString);
-  Services.prefs.setCharPref(gKeyString, "");
-}
-
-function teardownModule(module) {
-  Services.prefs.setCharPref(gKeyString, gOldWhiteList);
-}
-
-/* First, test that when we initially load the account manager, that
- * we're not whitelisting any address books.  Then, we'll check all
- * address books and save.
- */
-function subtest_check_whitelist_init_and_save(amc) {
-  // Ok, the advanced settings window is open.  Let's choose
-  // the junkmail settings.
-  let accountRow = get_account_tree_row(gAccount.key, "am-junk.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  let doc = amc.window.document.getElementById("contentFrame").contentDocument;
-
-  // At this point, we shouldn't have anything checked, but we should have
-  // the two default address books (Personal and Collected) displayed
-  let list = doc.getElementById("whiteListAbURI");
-  assert_equals(
-    2,
-    list.getRowCount(),
-    "There was an unexpected number of address books"
-  );
-
-  // Now we'll check both address books
-  for (let i = 0; i < list.getRowCount(); i++) {
-    let abNode = list.getItemAtIndex(i);
-    amc.click(new elib.Elem(abNode.firstElementChild));
-  }
-
-  // And close the dialog
-  amc.window.document.getElementById("accountManager").acceptDialog();
-}
-
-/* Next, we'll make sure that the address books we checked in
- * subtest_check_whitelist_init_and_save were properly saved.
- * Then, we'll clear the address books and save.
- */
-function subtest_check_whitelist_load_and_clear(amc) {
-  let accountRow = get_account_tree_row(gAccount.key, "am-junk.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  let doc = amc.window.document.getElementById("contentFrame").contentDocument;
-  let list = doc.getElementById("whiteListAbURI");
-  let whiteListURIs = Services.prefs.getCharPref(gKeyString).split(" ");
-
-  for (let i = 0; i < list.getRowCount(); i++) {
-    let abNode = list.getItemAtIndex(i);
-    assert_equals(
-      "true",
-      abNode.firstElementChild.getAttribute("checked"),
-      "Should have been checked"
-    );
-    // Also ensure that the address book URI was properly saved in the
-    // prefs
-    assert_true(whiteListURIs.includes(abNode.getAttribute("value")));
-    // Now un-check that address book
-    amc.click(new elib.Elem(abNode.firstElementChild));
-  }
-
-  // And close the dialog
-  amc.window.document.getElementById("accountManager").acceptDialog();
-}
-
-/* Finally, we'll make sure that the address books we cleared
- * were actually cleared.
- */
-function subtest_check_whitelist_load_cleared(amc) {
-  let accountRow = get_account_tree_row(gAccount.key, "am-junk.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  let doc = amc.window.document.getElementById("contentFrame").contentDocument;
-  let list = doc.getElementById("whiteListAbURI");
-  let whiteListURIs = "";
-
-  try {
-    whiteListURIs = Services.prefs.getCharPref(gKeyString);
-    // We should have failed here, because the pref should have been cleared
-    // out.
-    throw Error(
-      "The whitelist preference for this server wasn't properly cleared."
-    );
-  } catch (e) {}
-
-  for (let i = 0; i < list.getRowCount(); i++) {
-    let abNode = list.getItemAtIndex(i);
-    assert_equals(
-      "false",
-      abNode.firstElementChild.getAttribute("checked"),
-      "Should not have been checked"
-    );
-    // Also ensure that the address book URI was properly cleared in the
-    // prefs
-    assert_false(whiteListURIs.includes(abNode.getAttribute("value")));
-  }
-
-  // And close the dialog
-  amc.window.document.getElementById("accountManager").acceptDialog();
-}
-
-function test_address_book_whitelist() {
-  open_advanced_settings(subtest_check_whitelist_init_and_save);
-  open_advanced_settings(subtest_check_whitelist_load_and_clear);
-  open_advanced_settings(subtest_check_whitelist_load_cleared);
-}

deleted file mode 100644
--- a/mail/test/mozmill/account/test-account-actions.js
+++ /dev/null
@@ -1,196 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-var {
-  click_account_tree_row,
-  get_account_tree_row,
-  open_advanced_settings,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/AccountManagerHelpers.jsm"
-);
-var {
-  assert_equals,
-  assert_not_equals,
-  assert_true,
-  close_popup,
-  wait_for_popup_to_open,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
-);
-
-var { MailServices } = ChromeUtils.import(
-  "resource:///modules/MailServices.jsm"
-);
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-var imapAccount, nntpAccount, originalAccountCount;
-
-function setupModule(module) {
-  // There may be pre-existing accounts from other tests.
-  originalAccountCount = MailServices.accounts.allServers.length;
-  // There already should be a Local Folders account created.
-  // It is needed for this test.
-  assert_true(MailServices.accounts.localFoldersServer);
-
-  // Create an IMAP server
-  let imapServer = MailServices.accounts
-    .createIncomingServer("nobody", "example.com", "imap")
-    .QueryInterface(Ci.nsIImapIncomingServer);
-
-  let identity = MailServices.accounts.createIdentity();
-  identity.email = "tinderbox@example.com";
-
-  imapAccount = MailServices.accounts.createAccount();
-  imapAccount.incomingServer = imapServer;
-  imapAccount.addIdentity(identity);
-
-  // Create a NNTP server
-  let nntpServer = MailServices.accounts
-    .createIncomingServer(null, "example.nntp.invalid", "nntp")
-    .QueryInterface(Ci.nsINntpIncomingServer);
-
-  identity = MailServices.accounts.createIdentity();
-  identity.email = "tinderbox2@example.com";
-
-  nntpAccount = MailServices.accounts.createAccount();
-  nntpAccount.incomingServer = nntpServer;
-  nntpAccount.addIdentity(identity);
-  // Now there should be 2 more accounts.
-  assert_equals(
-    MailServices.accounts.allServers.length,
-    originalAccountCount + 2
-  );
-}
-
-function teardownModule(module) {
-  // Remove our test accounts to leave the profile clean.
-  MailServices.accounts.removeAccount(nntpAccount);
-  MailServices.accounts.removeAccount(imapAccount);
-  // There should be only the original accounts left.
-  assert_equals(MailServices.accounts.allServers.length, originalAccountCount);
-}
-
-/**
- * Check that the account actions for the account are enabled or disabled appropriately.
- *
- * @param amc          the account options controller
- * @param aAccountKey  the key of the account to select
- * @param aIsSetAsDefaultEnabled  true if the menuitem should be enabled, false otherwise
- * @param aIsRemoveEnabled        true if the menuitem should be enabled, false otherwise
- * @param aIsAddAccountEnabled    true if the menuitems (Add Mail Account+Add Other Account)
- *                                should be enabled, false otherwise
- */
-function subtest_check_account_actions(
-  amc,
-  aAccountKey,
-  aIsSetAsDefaultEnabled,
-  aIsRemoveEnabled,
-  aIsAddAccountEnabled
-) {
-  let accountRow = get_account_tree_row(aAccountKey, null, amc);
-  click_account_tree_row(amc, accountRow);
-
-  // click the Actions Button to bring up the popup with menuitems to test
-  amc.click(amc.eid("accountActionsButton"), 5, 5);
-  wait_for_popup_to_open(amc.e("accountActionsDropdown"));
-
-  let actionAddMailAccount = amc.e("accountActionsAddMailAccount");
-  assert_not_equals(actionAddMailAccount, undefined);
-  assert_equals(
-    !actionAddMailAccount.getAttribute("disabled"),
-    aIsAddAccountEnabled
-  );
-
-  let actionAddOtherAccount = amc.e("accountActionsAddOtherAccount");
-  assert_not_equals(actionAddOtherAccount, undefined);
-  assert_equals(
-    !actionAddOtherAccount.getAttribute("disabled"),
-    aIsAddAccountEnabled
-  );
-
-  let actionSetDefault = amc.e("accountActionsDropdownSetDefault");
-  assert_not_equals(actionSetDefault, undefined);
-  assert_equals(
-    !actionSetDefault.getAttribute("disabled"),
-    aIsSetAsDefaultEnabled
-  );
-
-  let actionRemove = amc.e("accountActionsDropdownRemove");
-  assert_not_equals(actionRemove, undefined);
-  assert_equals(!actionRemove.getAttribute("disabled"), aIsRemoveEnabled);
-
-  close_popup(amc, amc.eid("accountActionsDropdown"));
-}
-
-function test_account_actions() {
-  // IMAP account: can be default, can be removed.
-  open_advanced_settings(function(amc) {
-    subtest_check_account_actions(amc, imapAccount.key, true, true, true);
-  });
-
-  // NNTP (News) account: can't be default, can be removed.
-  open_advanced_settings(function(amc) {
-    subtest_check_account_actions(amc, nntpAccount.key, false, true, true);
-  });
-
-  // Local Folders account: can't be removed, can't be default.
-  var localFoldersAccount = MailServices.accounts.FindAccountForServer(
-    MailServices.accounts.localFoldersServer
-  );
-  open_advanced_settings(function(amc) {
-    subtest_check_account_actions(
-      amc,
-      localFoldersAccount.key,
-      false,
-      false,
-      true
-    );
-  });
-  // SMTP server row: can't be removed, can't be default.
-  open_advanced_settings(function(amc) {
-    subtest_check_account_actions(amc, null, false, false, true);
-  });
-
-  // on the IMAP account, disable Delete Account menu item
-  let disableItemPref = "mail.disable_button.delete_account";
-
-  // Set the pref on the default branch, otherwise .getBoolPref on it throws.
-  Services.prefs.getDefaultBranch("").setBoolPref(disableItemPref, true);
-  Services.prefs.lockPref(disableItemPref);
-
-  open_advanced_settings(function(amc) {
-    subtest_check_account_actions(amc, imapAccount.key, true, false, true);
-  });
-
-  Services.prefs.unlockPref(disableItemPref);
-  Services.prefs.getDefaultBranch("").deleteBranch(disableItemPref);
-
-  // on the IMAP account, disable Set as Default menu item
-  disableItemPref = "mail.disable_button.set_default_account";
-
-  Services.prefs.getDefaultBranch("").setBoolPref(disableItemPref, true);
-  Services.prefs.lockPref(disableItemPref);
-
-  open_advanced_settings(function(amc) {
-    subtest_check_account_actions(amc, imapAccount.key, false, true, true);
-  });
-
-  Services.prefs.unlockPref(disableItemPref);
-  Services.prefs.getDefaultBranch("").deleteBranch(disableItemPref);
-
-  // on the IMAP account, disable Add new Account menu items
-  disableItemPref = "mail.disable_new_account_addition";
-
-  Services.prefs.getDefaultBranch("").setBoolPref(disableItemPref, true);
-  Services.prefs.lockPref(disableItemPref);
-
-  open_advanced_settings(function(amc) {
-    subtest_check_account_actions(amc, imapAccount.key, true, true, false);
-  });
-
-  Services.prefs.unlockPref(disableItemPref);
-  Services.prefs.getDefaultBranch("").deleteBranch(disableItemPref);
-}

deleted file mode 100644
--- a/mail/test/mozmill/account/test-account-deletion.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This test checks proper deletion of an account from the Account manager.
- */
-
-"use strict";
-
-var { open_advanced_settings, remove_account } = ChromeUtils.import(
-  "resource://testing-common/mozmill/AccountManagerHelpers.jsm"
-);
-var { assert_equals, assert_false, assert_true } = ChromeUtils.import(
-  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
-);
-
-var { MailServices } = ChromeUtils.import(
-  "resource:///modules/MailServices.jsm"
-);
-
-var gPopAccount, gImapAccount, gOriginalAccountCount;
-
-function setupModule(module) {
-  // There may be pre-existing accounts from other tests.
-  gOriginalAccountCount = MailServices.accounts.allServers.length;
-
-  // Create a POP server
-  let popServer = MailServices.accounts
-    .createIncomingServer("nobody", "pop.foo.invalid", "pop3")
-    .QueryInterface(Ci.nsIPop3IncomingServer);
-
-  let identity = MailServices.accounts.createIdentity();
-  identity.email = "tinderbox@pop.foo.invalid";
-
-  gPopAccount = MailServices.accounts.createAccount();
-  gPopAccount.incomingServer = popServer;
-  gPopAccount.addIdentity(identity);
-
-  // Create an IMAP server
-  let imapServer = MailServices.accounts
-    .createIncomingServer("nobody", "imap.foo.invalid", "imap")
-    .QueryInterface(Ci.nsIImapIncomingServer);
-
-  identity = MailServices.accounts.createIdentity();
-  identity.email = "tinderbox@imap.foo.invalid";
-
-  gImapAccount = MailServices.accounts.createAccount();
-  gImapAccount.incomingServer = imapServer;
-  gImapAccount.addIdentity(identity);
-
-  assert_equals(
-    MailServices.accounts.allServers.length,
-    gOriginalAccountCount + 2
-  );
-}
-
-function teardownModule(module) {
-  // There should be only the original accounts left.
-  assert_equals(MailServices.accounts.allServers.length, gOriginalAccountCount);
-}
-
-function test_account_data_deletion() {
-  open_advanced_settings(function(amc) {
-    subtest_account_data_deletion1(amc);
-  });
-
-  open_advanced_settings(function(amc) {
-    subtest_account_data_deletion2(amc);
-  });
-}
-
-/**
- * Bug 274452
- * Check if files of an account are preserved.
- *
- * @param amc  The account options controller.
- */
-function subtest_account_data_deletion1(amc) {
-  let accountDir = gPopAccount.incomingServer.localPath;
-  assert_true(accountDir.isDirectory());
-
-  // Get some existing file in the POP3 account data dir.
-  let inboxFile = accountDir.clone();
-  inboxFile.append("Inbox.msf");
-  assert_true(inboxFile.isFile());
-
-  remove_account(gPopAccount, amc, true, false);
-  gPopAccount = null;
-  assert_true(accountDir.exists());
-}
-
-/**
- * Bug 274452
- * Check if files of an account can be deleted.
- *
- * @param amc  The account options controller.
- */
-function subtest_account_data_deletion2(amc) {
-  let accountDir = gImapAccount.incomingServer.localPath;
-  assert_true(accountDir.isDirectory());
-
-  // Get some file in the IMAP account data dir.
-  let inboxFile = accountDir.clone();
-  inboxFile.append("INBOX.msf");
-  assert_true(inboxFile.isFile());
-
-  remove_account(gImapAccount, amc, true, true);
-  gImapAccount = null;
-  assert_false(accountDir.exists());
-}

deleted file mode 100644
--- a/mail/test/mozmill/account/test-account-port-setting.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-var elib = ChromeUtils.import(
-  "chrome://mozmill/content/modules/elementslib.jsm"
-);
-
-var {
-  click_account_tree_row,
-  get_account_tree_row,
-  open_advanced_settings,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/AccountManagerHelpers.jsm"
-);
-var { FAKE_SERVER_HOSTNAME, mc } = ChromeUtils.import(
-  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
-);
-var { input_value, delete_all_existing } = ChromeUtils.import(
-  "resource://testing-common/mozmill/KeyboardHelpers.jsm"
-);
-
-var { MailServices } = ChromeUtils.import(
-  "resource:///modules/MailServices.jsm"
-);
-
-var PORT_NUMBERS_TO_TEST = [
-  "110", // The original port number. We don't input this though.
-  "456", // Random port number.
-  "995", // The SSL port number.
-  "110", // Back to the original.
-];
-
-var gTestNumber;
-
-function subtest_check_set_port_number(amc, aDontSet) {
-  // This test expects the following POP account to exist by default
-  // with port number 110 and no security.
-  let server = MailServices.accounts.FindServer(
-    "tinderbox",
-    FAKE_SERVER_HOSTNAME,
-    "pop3"
-  );
-  let account = MailServices.accounts.FindAccountForServer(server);
-
-  let accountRow = get_account_tree_row(account.key, "am-server.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  let iframe = amc.window.document.getElementById("contentFrame");
-  let portElem = iframe.contentDocument.getElementById("server.port");
-  portElem.focus();
-
-  if (portElem.value != PORT_NUMBERS_TO_TEST[gTestNumber - 1]) {
-    throw new Error(
-      "Port Value is not " +
-        PORT_NUMBERS_TO_TEST[gTestNumber - 1] +
-        " as expected, it is: " +
-        portElem.value
-    );
-  }
-
-  if (!aDontSet) {
-    delete_all_existing(amc, new elib.Elem(portElem));
-    input_value(amc, PORT_NUMBERS_TO_TEST[gTestNumber]);
-
-    mc.sleep(0);
-  }
-
-  mc.click(
-    new elib.Elem(
-      amc.window.document.getElementById("accountManager").getButton("accept")
-    )
-  );
-}
-
-function subtest_check_port_number(amc) {
-  subtest_check_set_port_number(amc, true);
-}
-
-function test_account_port_setting() {
-  for (
-    gTestNumber = 1;
-    gTestNumber < PORT_NUMBERS_TO_TEST.length;
-    ++gTestNumber
-  ) {
-    open_advanced_settings(subtest_check_set_port_number);
-  }
-
-  open_advanced_settings(subtest_check_port_number);
-}

deleted file mode 100644
--- a/mail/test/mozmill/account/test-account-settings-infrastructure.js
+++ /dev/null
@@ -1,461 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This test checks proper operation of the account settings panes infrastructure
- * in the Account manager. E.g. if the values of elements are properly stored when
- * panes are switched.
- *
- * New checks can be added to it as needed.
- */
-
-"use strict";
-
-var elib = ChromeUtils.import(
-  "chrome://mozmill/content/modules/elementslib.jsm"
-);
-
-var {
-  click_account_tree_row,
-  get_account_tree_row,
-  open_advanced_settings,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/AccountManagerHelpers.jsm"
-);
-var {
-  assert_equals,
-  assert_false,
-  assert_true,
-  FAKE_SERVER_HOSTNAME,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
-);
-
-var { MailServices } = ChromeUtils.import(
-  "resource:///modules/MailServices.jsm"
-);
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-var gPopAccount, gImapAccount, gOriginalAccountCount;
-
-function setupModule(module) {
-  // There may be pre-existing accounts from other tests.
-  gOriginalAccountCount = MailServices.accounts.allServers.length;
-
-  // Create a POP server
-  let popServer = MailServices.accounts
-    .createIncomingServer("nobody", "pop.invalid", "pop3")
-    .QueryInterface(Ci.nsIPop3IncomingServer);
-
-  let identity = MailServices.accounts.createIdentity();
-  identity.email = "tinderbox@pop.invalid";
-
-  gPopAccount = MailServices.accounts.createAccount();
-  gPopAccount.incomingServer = popServer;
-  gPopAccount.addIdentity(identity);
-
-  // Create an IMAP server
-  let imapServer = MailServices.accounts
-    .createIncomingServer("nobody", "imap.invalid", "imap")
-    .QueryInterface(Ci.nsIImapIncomingServer);
-
-  identity = MailServices.accounts.createIdentity();
-  identity.email = "tinderbox@imap.invalid";
-
-  gImapAccount = MailServices.accounts.createAccount();
-  gImapAccount.incomingServer = imapServer;
-  gImapAccount.addIdentity(identity);
-
-  // Now there should be one more account.
-  assert_equals(
-    MailServices.accounts.allServers.length,
-    gOriginalAccountCount + 2
-  );
-}
-
-function teardownModule(module) {
-  // Remove our test accounts to leave the profile clean.
-  MailServices.accounts.removeAccount(gPopAccount);
-  MailServices.accounts.removeAccount(gImapAccount);
-
-  // There should be only the original accounts left.
-  assert_equals(MailServices.accounts.allServers.length, gOriginalAccountCount);
-}
-
-/**
- * Bug 525024.
- * Check that the options in the server pane are properly preserved across
- * pane switches.
- */
-function test_account_dot_IDs() {
-  open_advanced_settings(function(amc) {
-    subtest_check_account_dot_IDs(amc);
-  });
-}
-
-/**
- * Check that the options in the server pane are stored even if the id
- * of the element contains multiple dots (not used in standard TB yet
- * but extensions may want it).
- *
- * @param amc  the account options controller
- */
-function subtest_check_account_dot_IDs(amc) {
-  let accountRow = get_account_tree_row(
-    gPopAccount.key,
-    "am-server.xhtml",
-    amc
-  );
-  click_account_tree_row(amc, accountRow);
-
-  let iframe = amc.e("contentFrame").contentDocument;
-  // Check whether a standard element with "server.loginAtStartUp" stores its
-  // value properly.
-  let loginCheck = iframe.getElementById("server.loginAtStartUp");
-  assert_false(loginCheck.checked);
-  amc.check(new elib.Elem(loginCheck), true);
-
-  accountRow = get_account_tree_row(gPopAccount.key, "am-junk.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  accountRow = get_account_tree_row(gPopAccount.key, "am-server.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  // Re-assign iframe.contentDocument because it was lost when changing panes
-  // (uses loadURI to load a new document).
-  iframe = amc.e("contentFrame").contentDocument;
-
-  // Check by element properties.
-  loginCheck = iframe.getElementById("server.loginAtStartUp");
-  assert_true(loginCheck.checked);
-
-  // Check for correct value in the accountValues array, that will be saved into prefs.
-  let rawCheckValue = amc.window.getAccountValue(
-    gPopAccount,
-    amc.window.getValueArrayFor(gPopAccount),
-    "server",
-    "loginAtStartUp",
-    null,
-    false
-  );
-
-  assert_true(rawCheckValue);
-
-  // The "server.login.At.StartUp" value does not exist yet, so the value should be 'null'.
-  rawCheckValue = amc.window.getAccountValue(
-    gPopAccount,
-    amc.window.getValueArrayFor(gPopAccount),
-    "server",
-    "login.At.StartUp",
-    null,
-    false
-  );
-  assert_equals(rawCheckValue, null);
-
-  // Change the ID so that "server.login.At.StartUp" exists now.
-  loginCheck.id = "server.login.At.StartUp";
-
-  accountRow = get_account_tree_row(gPopAccount.key, "am-junk.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  accountRow = get_account_tree_row(gPopAccount.key, "am-server.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  // Check for correct value in the accountValues array, that will be saved into prefs.
-  // We can't check by element property here, because the am-server.xhtml pane was
-  // reloaded and the element now has the original ID of "server.loginAtStartUp".
-  rawCheckValue = amc.window.getAccountValue(
-    gPopAccount,
-    amc.window.getValueArrayFor(gPopAccount),
-    "server",
-    "login.At.StartUp",
-    null,
-    false
-  );
-
-  assert_true(rawCheckValue);
-}
-
-/**
- * Test for bug 807101.
- * Check if form controls are properly disabled when their attached prefs are locked.
- */
-function test_account_locked_prefs() {
-  open_advanced_settings(function(amc) {
-    subtest_check_locked_prefs_addressing(amc);
-  });
-
-  open_advanced_settings(function(amc) {
-    subtest_check_locked_prefs_server(amc);
-  });
-}
-
-/**
- * Check that the LDAP server selection elements (radio group) are properly
- * disabled when their attached pref (prefstring attribute) is locked.
- *
- * @param amc  the account options controller
- */
-function subtest_check_locked_prefs_addressing(amc) {
-  let accountRow = get_account_tree_row(
-    gPopAccount.key,
-    "am-addressing.xhtml",
-    amc
-  );
-  click_account_tree_row(amc, accountRow);
-
-  let iframe = amc.e("contentFrame").contentDocument;
-
-  // By default, 'use global LDAP server preferences' is set, not the
-  // 'different LDAP server'.
-  let useLDAPdirectory = iframe.getElementById("directories");
-  assert_false(useLDAPdirectory.selected);
-
-  // So the server selector is disabled.
-  let LDAPdirectory = iframe.getElementById("identity.directoryServer");
-  assert_true(LDAPdirectory.disabled);
-
-  // And the Edit button too.
-  let LDAPeditButton = iframe.getElementById("editButton");
-  assert_true(LDAPeditButton.disabled);
-
-  // Now toggle the 'different LDAP server' on. The server selector
-  // and edit button should enable.
-  amc.radio(new elib.Elem(useLDAPdirectory));
-  assert_false(LDAPdirectory.disabled);
-  assert_false(LDAPeditButton.disabled);
-
-  // Lock the pref for the server selector.
-  let prefstring = LDAPdirectory.getAttribute("prefstring");
-  let controlPref = prefstring.replace(
-    "%identitykey%",
-    gPopAccount.defaultIdentity.key
-  );
-  Services.prefs.getDefaultBranch("").setBoolPref(controlPref, "xxx");
-  Services.prefs.lockPref(controlPref);
-
-  // Refresh the pane by switching to another one.
-  accountRow = get_account_tree_row(gPopAccount.key, "am-junk.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  accountRow = get_account_tree_row(
-    gPopAccount.key,
-    "am-addressing.xhtml",
-    amc
-  );
-  click_account_tree_row(amc, accountRow);
-
-  // Re-assign iframe.contentDocument because it was lost when changing panes
-  // (uses loadURI to load a new document).
-  iframe = amc.e("contentFrame").contentDocument;
-
-  // We are now back and the 'different LDAP server' should still be selected
-  // (the setting was saved).
-  useLDAPdirectory = iframe.getElementById("directories");
-  assert_true(useLDAPdirectory.selected);
-
-  // But now the server selector should be disabled due to locked pref.
-  LDAPdirectory = iframe.getElementById("identity.directoryServer");
-  assert_true(LDAPdirectory.disabled);
-
-  // The edit button still enabled (does not depend on the same pref lock)
-  LDAPeditButton = iframe.getElementById("editButton");
-  assert_false(LDAPeditButton.disabled);
-
-  // Unlock the pref to clean up.
-  Services.prefs.unlockPref(controlPref);
-  Services.prefs.getDefaultBranch("").deleteBranch(controlPref);
-}
-
-/**
- * Check that the POP3 'keep on server' settings elements (2-level
- * checkboxes + textbox) are properly disabled when their attached pref
- * (prefstring attribute) is locked.
- *
- * @param amc  the account options controller
- */
-function subtest_check_locked_prefs_server(amc) {
-  let accountRow = get_account_tree_row(
-    gPopAccount.key,
-    "am-server.xhtml",
-    amc
-  );
-  click_account_tree_row(amc, accountRow);
-
-  let iframe = amc.e("contentFrame").contentDocument;
-
-  // Top level leaveOnServer checkbox, disabled by default.
-  let leaveOnServer = iframe.getElementById("pop3.leaveMessagesOnServer");
-  assert_false(leaveOnServer.disabled);
-  assert_false(leaveOnServer.checked);
-
-  // Second level deleteByAge checkbox, disabled by default.
-  let deleteByAge = iframe.getElementById("pop3.deleteByAgeFromServer");
-  assert_true(deleteByAge.disabled);
-  assert_false(deleteByAge.checked);
-
-  // Third level daysToLeave textbox, disabled by default.
-  let daysToLeave = iframe.getElementById("pop3.numDaysToLeaveOnServer");
-  assert_true(daysToLeave.disabled);
-
-  // When leaveOnServer is checked, only deleteByAge will get enabled.
-  amc.check(new elib.Elem(leaveOnServer), true);
-  assert_true(leaveOnServer.checked);
-  assert_false(deleteByAge.disabled);
-  assert_true(daysToLeave.disabled);
-
-  // When deleteByAge is checked, daysToLeave will get enabled.
-  amc.check(new elib.Elem(deleteByAge), true);
-  assert_true(deleteByAge.checked);
-  assert_false(daysToLeave.disabled);
-
-  // Lock the pref deleteByAge checkbox (middle of the element hierarchy).
-  let prefstring = deleteByAge.getAttribute("prefstring");
-  let controlPref = prefstring.replace(
-    "%serverkey%",
-    gPopAccount.incomingServer.key
-  );
-  Services.prefs.getDefaultBranch("").setBoolPref(controlPref, true);
-  Services.prefs.lockPref(controlPref);
-
-  // Refresh the pane by switching to another one.
-  accountRow = get_account_tree_row(gPopAccount.key, "am-junk.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  accountRow = get_account_tree_row(gPopAccount.key, "am-server.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  // Re-assign iframe.contentDocument because it was lost when changing panes
-  // (uses loadURI to load a new document).
-  iframe = amc.e("contentFrame").contentDocument;
-
-  // Now leaveOnServer was preserved as checked.
-  leaveOnServer = iframe.getElementById("pop3.leaveMessagesOnServer");
-  assert_false(leaveOnServer.disabled);
-  assert_true(leaveOnServer.checked);
-
-  // Now deleteByAge was preserved as checked but is locked/disabled.
-  deleteByAge = iframe.getElementById("pop3.deleteByAgeFromServer");
-  assert_true(deleteByAge.disabled);
-  assert_true(deleteByAge.checked);
-
-  // Because deleteByAge is checked, daysToLeave should be enabled.
-  daysToLeave = iframe.getElementById("pop3.numDaysToLeaveOnServer");
-  assert_false(daysToLeave.disabled);
-
-  // When leaveOnserver is unchecked, both of deleteByAge and daysToLeave
-  // should get disabled.
-  amc.check(new elib.Elem(leaveOnServer), false);
-  assert_false(leaveOnServer.disabled);
-  assert_false(leaveOnServer.checked);
-
-  assert_true(deleteByAge.disabled);
-  assert_true(deleteByAge.checked);
-  assert_true(daysToLeave.disabled);
-
-  // Unlock the pref to clean up.
-  Services.prefs.unlockPref(controlPref);
-  Services.prefs.getDefaultBranch("").deleteBranch(controlPref);
-}
-
-/**
- * Bug 530142.
- * Check that that if one field is set to a value, switching directly to another
- * account pane showing the same field really loads the value from the new account,
- * even when empty. This is tested on the Reply-To field.
- */
-function test_replyTo_leak() {
-  open_advanced_settings(function(amc) {
-    subtest_check_replyTo_leak(amc);
-  });
-}
-
-/**
- * @param amc  the account options controller
- */
-function subtest_check_replyTo_leak(amc) {
-  let accountRow = get_account_tree_row(gPopAccount.key, null, amc);
-  click_account_tree_row(amc, accountRow);
-
-  let iframe = amc.window.document.getElementById("contentFrame");
-
-  // The Reply-To field should be empty.
-  let replyAddress = iframe.contentDocument.getElementById("identity.replyTo");
-  assert_equals(replyAddress.value, "");
-
-  // Now we set a value into it and switch to another account, the main pane.
-  replyAddress.value = "somewhere@else.com";
-
-  // This test expects the following POP account to exist by default
-  // in the test profile with port number 110 and no security.
-  let firstServer = MailServices.accounts.FindServer(
-    "tinderbox",
-    FAKE_SERVER_HOSTNAME,
-    "pop3"
-  );
-  let firstAccount = MailServices.accounts.FindAccountForServer(firstServer);
-
-  accountRow = get_account_tree_row(firstAccount.key, null, amc);
-  click_account_tree_row(amc, accountRow);
-
-  // the Reply-To field should be empty as this account does not have it set.
-  replyAddress = iframe.contentDocument.getElementById("identity.replyTo");
-  assert_equals(replyAddress.value, "");
-}
-
-/**
- * Test for bug 804091.
- * Check if onchange handlers are properly executed when panes are switched.
- */
-function test_account_onchange_handler() {
-  open_advanced_settings(function(amc) {
-    subtest_check_onchange_handler(amc);
-  });
-}
-
-/**
- * Check if onchange handlers are properly executed when panes are switched.
- *
- * @param amc  the account options controller
- */
-function subtest_check_onchange_handler(amc) {
-  let accountRow = get_account_tree_row(
-    gImapAccount.key,
-    "am-offline.xhtml",
-    amc
-  );
-  click_account_tree_row(amc, accountRow);
-
-  let iframe = amc.e("contentFrame").contentDocument;
-
-  let autoSync = iframe.getElementById("autosyncValue");
-  // 30 is the default value so check if we are in clean state.
-  assert_equals(autoSync.value, 30);
-
-  let autoSyncInterval = iframe.getElementById("autosyncInterval");
-  // 1 is the default value and means the 30 is in days.
-  assert_equals(autoSyncInterval.value, 1);
-
-  // Now type in 35 (days).
-  amc.radio(new elib.ID(iframe, "useAutosync.ByAge"));
-  autoSync.select();
-  amc.type(new elib.Elem(autoSync), "35");
-
-  // Immediately switch to another pane and back.
-  accountRow = get_account_tree_row(gImapAccount.key, "am-junk.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  accountRow = get_account_tree_row(gImapAccount.key, "am-offline.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  iframe = amc.e("contentFrame").contentDocument;
-
-  // The pane optimized the entered value a bit. So now we should find 5.
-  autoSync = iframe.getElementById("autosyncValue");
-  assert_equals(autoSync.value, 5);
-
-  // And the unit is 7 days = week.
-  autoSyncInterval = iframe.getElementById("autosyncInterval");
-  assert_equals(autoSyncInterval.value, 7);
-}

deleted file mode 100644
--- a/mail/test/mozmill/account/test-account-tree.js
+++ /dev/null
@@ -1,202 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This test checks proper operation of the account tree in the Account manager.
- */
-
-"use strict";
-
-var {
-  click_account_tree_row,
-  get_account_tree_row,
-  open_advanced_settings,
-  remove_account,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/AccountManagerHelpers.jsm"
-);
-var { assert_equals, assert_false, assert_true } = ChromeUtils.import(
-  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
-);
-
-var { MailServices } = ChromeUtils.import(
-  "resource:///modules/MailServices.jsm"
-);
-
-var gPopAccount, gOriginalAccountCount;
-
-function setupModule(module) {
-  // There may be pre-existing accounts from other tests.
-  gOriginalAccountCount = MailServices.accounts.allServers.length;
-
-  // Create a POP server
-  let popServer = MailServices.accounts
-    .createIncomingServer("nobody", "foo.invalid", "pop3")
-    .QueryInterface(Ci.nsIPop3IncomingServer);
-
-  let identity = MailServices.accounts.createIdentity();
-  identity.email = "tinderbox@foo.invalid";
-
-  gPopAccount = MailServices.accounts.createAccount();
-  gPopAccount.incomingServer = popServer;
-  gPopAccount.addIdentity(identity);
-
-  // Now there should be one more account.
-  assert_equals(
-    MailServices.accounts.allServers.length,
-    gOriginalAccountCount + 1
-  );
-}
-
-function teardownModule(module) {
-  if (gPopAccount) {
-    // Remove our test account to leave the profile clean.
-    MailServices.accounts.removeAccount(gPopAccount);
-    gPopAccount = null;
-  }
-  // There should be only the original accounts left.
-  assert_equals(MailServices.accounts.allServers.length, gOriginalAccountCount);
-}
-
-/**
- * Test for bug 536248.
- * Check if the account manager dialog remembers the open state of accounts.
- */
-function test_account_open_state() {
-  open_advanced_settings(function(amc) {
-    subtest_check_account_open_state(amc, true);
-  });
-  open_advanced_settings(function(amc) {
-    subtest_check_account_open_state(amc, false);
-  });
-  // After this test all the accounts must be "open".
-}
-
-/**
- * Check if the open state of accounts is in the wished state.
- *
- * @param amc           The account options controller.
- * @param aWishedState  The open state in which the account row should be found (bool).
- */
-function subtest_check_account_open_state(amc, aWishedState) {
-  let accountRow = get_account_tree_row(gPopAccount.key, null, amc);
-  click_account_tree_row(amc, accountRow);
-
-  // See if the account row is in the wished open state.
-  let accountTree = amc.e("accounttree");
-  assert_equals(accountRow, accountTree.view.selection.currentIndex);
-  assert_equals(accountTree.view.isContainerOpen(accountRow), aWishedState);
-
-  accountTree.view.toggleOpenState(accountRow);
-  assert_equals(accountTree.view.isContainerOpen(accountRow), !aWishedState);
-
-  // Whatever the open state of the account was, selecting one of its subpanes
-  // must open it.
-  amc.window.selectServer(gPopAccount.incomingServer, "am-junk.xhtml");
-  assert_true(accountTree.view.isContainerOpen(accountRow));
-
-  // Set the proper state again for continuation of the test.
-  accountTree.view
-    .getItemAtIndex(accountRow)
-    .setAttribute("open", !aWishedState);
-  assert_equals(accountTree.view.isContainerOpen(accountRow), !aWishedState);
-}
-
-/**
- * Bug 740617.
- * Check if the default account is styled in bold.
- *
- */
-function test_default_account_highlight() {
-  open_advanced_settings(function(amc) {
-    subtest_check_default_account_highlight(amc);
-  });
-}
-
-/**
- * Check if the default account is styled in bold and another account is not.
- *
- * @param amc           The account options controller.
- */
-function subtest_check_default_account_highlight(amc) {
-  // Select the default account.
-  let accountRow = get_account_tree_row(
-    MailServices.accounts.defaultAccount.key,
-    null,
-    amc
-  );
-  click_account_tree_row(amc, accountRow);
-
-  let accountTree = amc.e("accounttree");
-  assert_equals(accountRow, accountTree.view.selection.currentIndex);
-  let cell = accountTree.view.getItemAtIndex(accountRow).firstElementChild
-    .firstElementChild;
-  assert_equals(cell.tagName, "treecell");
-
-  // We can't read the computed style of the tree cell directly, so at least see
-  // if the isDefaultServer-true property is set on it. Hopefully the proper style
-  // is attached to this property.
-  let propArray = accountTree.view
-    .getCellProperties(accountRow, accountTree.columns.getColumnAt(0))
-    .split(" ");
-  assert_true(propArray.includes("isDefaultServer-true"));
-
-  // Now select another account that is not default.
-  accountRow = get_account_tree_row(gPopAccount.key, null, amc);
-  click_account_tree_row(amc, accountRow);
-
-  // There should isDefaultServer-true on its tree cell.
-  propArray = accountTree.view
-    .getCellProperties(accountRow, accountTree.columns.getColumnAt(0))
-    .split(" ");
-  assert_false(propArray.includes("isDefaultServer-true"));
-}
-/**
- * Bug 58713.
- * Check if after deleting an account the next one is selected.
- *
- * This test should always be the last one as it removes our specially
- * created gPopAccount.
- */
-function test_selection_after_account_deletion() {
-  open_advanced_settings(function(amc) {
-    subtest_check_selection_after_account_deletion(amc);
-  });
-}
-
-/**
- * Check if after deleting an account the next one is selected.
- *
- * @param amc           The account options controller.
- */
-function subtest_check_selection_after_account_deletion(amc) {
-  let accountList = [];
-  let accountTreeNode = amc.e("account-tree-children");
-  // Build the list of accounts in the account tree (order is important).
-  for (let i = 0; i < accountTreeNode.children.length; i++) {
-    if ("_account" in accountTreeNode.children[i]) {
-      let curAccount = accountTreeNode.children[i]._account;
-      if (!accountList.includes(curAccount)) {
-        accountList.push(curAccount);
-      }
-    }
-  }
-
-  // Get position of the current account in the account list.
-  let accountIndex = accountList.indexOf(gPopAccount);
-
-  // Remove our account.
-  remove_account(gPopAccount, amc);
-  gPopAccount = null;
-  // Now there should be only the original accounts left.
-  assert_equals(MailServices.accounts.allServers.length, gOriginalAccountCount);
-
-  // See if the currently selected account is the one next in the account list.
-  let accountTree = amc.e("accounttree");
-  let accountRow = accountTree.view.selection.currentIndex;
-  assert_equals(
-    accountTree.view.getItemAtIndex(accountRow)._account,
-    accountList[accountIndex + 1]
-  );
-}

deleted file mode 100644
--- a/mail/test/mozmill/account/test-account-values.js
+++ /dev/null
@@ -1,402 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This test checks proper operation of the account settings panes
- * when certain special or invalid values are entered into the fields.
- */
-
-"use strict";
-
-var elib = ChromeUtils.import(
-  "chrome://mozmill/content/modules/elementslib.jsm"
-);
-
-var {
-  click_account_tree_row,
-  get_account_tree_row,
-  open_advanced_settings,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/AccountManagerHelpers.jsm"
-);
-var { assert_equals, assert_false } = ChromeUtils.import(
-  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
-);
-var { input_value, delete_all_existing } = ChromeUtils.import(
-  "resource://testing-common/mozmill/KeyboardHelpers.jsm"
-);
-var { plan_for_modal_dialog, wait_for_modal_dialog } = ChromeUtils.import(
-  "resource://testing-common/mozmill/WindowHelpers.jsm"
-);
-
-var { MailServices } = ChromeUtils.import(
-  "resource:///modules/MailServices.jsm"
-);
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-var gPopAccount, gOriginalAccountCount;
-
-function setupModule(module) {
-  // There may be pre-existing accounts from other tests.
-  gOriginalAccountCount = MailServices.accounts.allServers.length;
-
-  // Create a POP server
-  let popServer = MailServices.accounts
-    .createIncomingServer("nobody", "example.invalid", "pop3")
-    .QueryInterface(Ci.nsIPop3IncomingServer);
-
-  let identity = MailServices.accounts.createIdentity();
-  identity.email = "tinderbox@example.invalid";
-
-  gPopAccount = MailServices.accounts.createAccount();
-  gPopAccount.incomingServer = popServer;
-  gPopAccount.addIdentity(identity);
-
-  // Now there should be one more account.
-  assert_equals(
-    MailServices.accounts.allServers.length,
-    gOriginalAccountCount + 1
-  );
-}
-
-function teardownModule(module) {
-  // Remove our test account to leave the profile clean.
-  MailServices.accounts.removeAccount(gPopAccount);
-  // There should be only the original accounts left.
-  assert_equals(MailServices.accounts.allServers.length, gOriginalAccountCount);
-}
-
-/**
- * Bug 208628.
- * Check that if the CC field is empty, enabling CC will automatically
- * prefill the currently default email address.
- */
-function test_default_CC_address() {
-  open_advanced_settings(function(amc) {
-    subtest_check_default_CC_address(amc);
-  });
-}
-
-/**
- * Check that if the CC field is empty, enabling CC will automatically
- * prefill the currently default email address.
- *
- * @param amc  the account options controller
- */
-function subtest_check_default_CC_address(amc) {
-  let accountRow = get_account_tree_row(
-    gPopAccount.key,
-    "am-copies.xhtml",
-    amc
-  );
-  click_account_tree_row(amc, accountRow);
-
-  let iframe = amc.window.document.getElementById("contentFrame");
-
-  let defaultAddress = iframe.contentDocument.getElementById("identity.email")
-    .value;
-  let ccCheck = iframe.contentDocument.getElementById("identity.doCc");
-  let ccAddress = iframe.contentDocument.getElementById("identity.doCcList");
-  // The CC checkbox is not enabled and the address value is empty.
-  assert_false(ccCheck.checked);
-  assert_equals(ccAddress.value, "");
-  // After ticking the CC checkbox the default address should be prefilled.
-  amc.check(new elib.Elem(ccCheck), true);
-  assert_equals(ccAddress.value, defaultAddress);
-
-  let bccCheck = iframe.contentDocument.getElementById("identity.doBcc");
-  let bccAddress = iframe.contentDocument.getElementById("identity.doBccList");
-  // The BCC checkbox is not enabled but we set the address value to something.
-  assert_false(bccCheck.checked);
-  assert_equals(bccAddress.value, "");
-  let bccUserAddress = "somebody@else.invalid";
-  bccAddress.value = bccUserAddress;
-  // After ticking the BCC checkbox the current value of the address should not change.
-  amc.check(new elib.Elem(bccCheck), true);
-  assert_equals(bccAddress.value, bccUserAddress);
-}
-
-/**
- * Bug 720199.
- * Check if the account name automatically changes when the user changes
- * the username or hostname.
- */
-function test_account_name() {
-  // We already have a POP account ready.
-  // Create also a NNTP server.
-  let nntpServer = MailServices.accounts
-    .createIncomingServer(null, "example.nntp.invalid", "nntp")
-    .QueryInterface(Ci.nsINntpIncomingServer);
-
-  let identity = MailServices.accounts.createIdentity();
-  identity.email = "tinderbox2@example.invalid";
-
-  let nntpAccount = MailServices.accounts.createAccount();
-  nntpAccount.incomingServer = nntpServer;
-  nntpAccount.addIdentity(identity);
-
-  assert_equals(
-    gPopAccount.incomingServer.prettyName,
-    "nobody on example.invalid"
-  );
-  assert_equals(nntpAccount.incomingServer.prettyName, "example.nntp.invalid");
-
-  // The automatic account name update works only if the name is
-  // in the form of user@host.
-  gPopAccount.incomingServer.prettyName = "nobody@example.invalid";
-
-  let newHost = "some.host.invalid";
-  let newUser = "somebody";
-
-  // On NNTP there is no user name so just set new hostname.
-  open_advanced_settings(function(amc) {
-    subtest_check_account_name(nntpAccount, newHost, null, amc);
-  });
-
-  // And see if the account name is updated to it.
-  assert_equals(nntpAccount.incomingServer.prettyName, newHost);
-
-  // On POP3 there is both user name and host name.
-  // Set new host name first.
-  open_advanced_settings(function(amc) {
-    subtest_check_account_name(gPopAccount, newHost, null, amc);
-  });
-
-  // And see if in the account name the host part is updated to it.
-  assert_equals(gPopAccount.incomingServer.prettyName, "nobody@" + newHost);
-
-  // Set new host name first.
-  open_advanced_settings(function(amc) {
-    subtest_check_account_name(gPopAccount, null, newUser, amc);
-  });
-
-  // And see if in the account name the user part is updated.
-  assert_equals(gPopAccount.incomingServer.prettyName, newUser + "@" + newHost);
-
-  newHost = "another.host.invalid";
-  newUser = "anotherbody";
-
-  // Set user name and host name at once.
-  open_advanced_settings(function(amc) {
-    subtest_check_account_name(gPopAccount, newHost, newUser, amc);
-  });
-
-  // And see if in the account name the host part is updated to it.
-  assert_equals(gPopAccount.incomingServer.prettyName, newUser + "@" + newHost);
-
-  // Now have an account name where the name does not match the hostname.
-  gPopAccount.incomingServer.prettyName = newUser + "@example.invalid";
-
-  newHost = "third.host.invalid";
-  // Set the host name again.
-  open_advanced_settings(function(amc) {
-    subtest_check_account_name(gPopAccount, newHost, null, amc);
-  });
-
-  // And the account name should not be touched.
-  assert_equals(
-    gPopAccount.incomingServer.prettyName,
-    newUser + "@example.invalid"
-  );
-
-  MailServices.accounts.removeAccount(nntpAccount);
-}
-
-/**
- * Changes the user name and hostname to the supplied values.
- *
- * @param aAccount      the account to change
- * @param aNewHostname  the hostname value to set
- * @param aNewUsername  the username value to set
- * @param amc           the account options controller
- */
-function subtest_check_account_name(aAccount, aNewHostname, aNewUsername, amc) {
-  let accountRow = get_account_tree_row(aAccount.key, "am-server.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  let iframe = amc.window.document.getElementById("contentFrame");
-
-  if (aNewHostname) {
-    let hostname = iframe.contentDocument.getElementById("server.realHostName");
-    assert_equals(hostname.value, aAccount.incomingServer.realHostName);
-
-    // Now change the server host name.
-    hostname.value = aNewHostname;
-  }
-
-  if (aNewUsername) {
-    let username = iframe.contentDocument.getElementById("server.realUsername");
-    assert_equals(username.value, aAccount.incomingServer.realUsername);
-
-    // Now change the server user name.
-    username.value = aNewUsername;
-  }
-
-  if (aNewUsername) {
-    // If username has changed, we get a confirmation dialog.
-    plan_for_modal_dialog("commonDialogWindow", function(cdc) {
-      // Just dismiss it.
-      cdc.window.document.documentElement
-        .querySelector("dialog")
-        .acceptDialog();
-    });
-  }
-  // We really need to save the new values so click OK on the Account settings.
-  amc.window.document.documentElement.querySelector("dialog").acceptDialog();
-  if (aNewUsername) {
-    wait_for_modal_dialog("commonDialogWindow");
-  }
-}
-
-/**
- * Bug 536768.
- * Check if invalid junk target settings (folders) are fixed to sane values.
- */
-function test_invalid_junk_target() {
-  // Set the junk target prefs to invalid values.
-  let branch = Services.prefs.getBranch(
-    "mail.server." + gPopAccount.incomingServer.key + "."
-  );
-  branch.setCharPref("spamActionTargetAccount", "some random non-existent URI");
-  branch.setCharPref("spamActionTargetFolder", "some random non-existent URI");
-  let moveOnSpam = true;
-  branch.setBoolPref("moveOnSpam", moveOnSpam);
-  open_advanced_settings(function(amc) {
-    subtest_check_invalid_junk_target(amc);
-  });
-
-  // The pref has no default so its non-existence means it was cleared.
-  moveOnSpam = branch.getBoolPref("moveOnSpam", false);
-  assert_false(moveOnSpam);
-  // The targets should point to the same pop account now.
-  let targetAccount = branch.getCharPref("spamActionTargetAccount");
-  assert_equals(targetAccount, gPopAccount.incomingServer.serverURI);
-  let targetFolder = branch.getCharPref("spamActionTargetFolder");
-  assert_equals(targetFolder, gPopAccount.incomingServer.serverURI + "/Junk");
-}
-
-/**
- * Just show the Junk settings pane and let it fix the values.
- *
- * @param amc  the account options controller
- */
-function subtest_check_invalid_junk_target(amc) {
-  let accountRow = get_account_tree_row(gPopAccount.key, "am-junk.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  // We need to save the new fixed values so click OK on the Account settings.
-  amc.window.document.documentElement.querySelector("dialog").acceptDialog();
-}
-
-/**
- * Bug 327812.
- * Checks if invalid server hostnames are not accepted.
- */
-function test_invalid_hostname() {
-  let branch = Services.prefs.getBranch(
-    "mail.server." + gPopAccount.incomingServer.key + "."
-  );
-  let origHostname = branch.getCharPref("realhostname");
-
-  open_advanced_settings(function(amc) {
-    subtest_check_invalid_hostname(amc, false, origHostname);
-  });
-  open_advanced_settings(function(amc) {
-    subtest_check_invalid_hostname(amc, true, origHostname);
-  });
-
-  // The new bad hostname should not have been saved.
-  let newHostname = branch.getCharPref("realhostname");
-  assert_equals(origHostname, newHostname);
-}
-
-/**
- * Set the hostname to an invalid value and check if it gets fixed.
- *
- * @param amc                the account options controller
- * @param aExitSettings      Attempt to close the Account settings dialog.
- * @param aOriginalHostname  Original hostname of this server.
- */
-function subtest_check_invalid_hostname(amc, aExitSettings, aOriginalHostname) {
-  let accountRow = get_account_tree_row(
-    gPopAccount.key,
-    "am-server.xhtml",
-    amc
-  );
-  click_account_tree_row(amc, accountRow);
-
-  let iframe = amc.window.document.getElementById("contentFrame");
-  let hostname = iframe.contentDocument.getElementById("server.realHostName");
-  assert_equals(hostname.value, aOriginalHostname);
-
-  hostname.value = "some_invalid+host&domain*in>invalid";
-
-  if (!aExitSettings) {
-    accountRow = get_account_tree_row(gPopAccount.key, "am-junk.xhtml", amc);
-    click_account_tree_row(amc, accountRow);
-
-    // The invalid hostname should be set back to previous value at this point...
-    accountRow = get_account_tree_row(gPopAccount.key, "am-server.xhtml", amc);
-    click_account_tree_row(amc, accountRow);
-
-    // ...let's check that:
-    iframe = amc.window.document.getElementById("contentFrame");
-    hostname = iframe.contentDocument.getElementById("server.realHostName");
-    assert_equals(hostname.value, aOriginalHostname);
-  } else {
-    // If the hostname is bad, we should get a warning dialog.
-    plan_for_modal_dialog("commonDialogWindow", function(cdc) {
-      // Just dismiss it.
-      cdc.window.document.documentElement
-        .querySelector("dialog")
-        .acceptDialog();
-    });
-
-    // Click OK on the Account settings.
-    amc.window.document.documentElement.querySelector("dialog").acceptDialog();
-
-    wait_for_modal_dialog("commonDialogWindow");
-  }
-}
-
-/**
- * Bug 1426328.
- * Check that the AM will trim user added spaces around text values.
- */
-const badName = "trailing  space ";
-const badEmail = " leading_space@example.com";
-
-function test_trailing_spaces() {
-  open_advanced_settings(function(amc) {
-    subtest_check_trailing_spaces(amc);
-  });
-  assert_equals(gPopAccount.incomingServer.prettyName, badName.trim());
-  assert_equals(gPopAccount.defaultIdentity.email, badEmail.trim());
-}
-
-/**
- * Check that the AM will trim user added spaces around text values
- * when storing them into the account.
- *
- * @param amc  the account options controller
- */
-function subtest_check_trailing_spaces(amc) {
-  let accountRow = get_account_tree_row(gPopAccount.key, null, amc);
-  click_account_tree_row(amc, accountRow);
-
-  let iframe = amc.window.document.getElementById("contentFrame");
-
-  let accountName = iframe.contentDocument.getElementById("server.prettyName");
-  let defaultAddress = iframe.contentDocument.getElementById("identity.email");
-  delete_all_existing(amc, new elib.Elem(accountName));
-  delete_all_existing(amc, new elib.Elem(defaultAddress));
-  input_value(amc, badName, new elib.Elem(accountName));
-  input_value(amc, badEmail, new elib.Elem(defaultAddress));
-
-  assert_equals(accountName.value, badName);
-  assert_equals(defaultAddress.value, badEmail);
-
-  // We really need to save the new values so click OK on the Account settings.
-  amc.window.document.documentElement.querySelector("dialog").acceptDialog();
-}

deleted file mode 100644
--- a/mail/test/mozmill/account/test-archive-options.js
+++ /dev/null
@@ -1,209 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-var mozmill = ChromeUtils.import(
-  "chrome://mozmill/content/modules/mozmill.jsm"
-);
-var controller = ChromeUtils.import(
-  "chrome://mozmill/content/modules/controller.jsm"
-);
-var elib = ChromeUtils.import(
-  "chrome://mozmill/content/modules/elementslib.jsm"
-);
-var utils = ChromeUtils.import("chrome://mozmill/content/modules/utils.jsm");
-
-var {
-  click_account_tree_row,
-  get_account_tree_row,
-  open_advanced_settings,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/AccountManagerHelpers.jsm"
-);
-var { assert_equals, assert_false, assert_true, mc } = ChromeUtils.import(
-  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
-);
-var {
-  plan_for_modal_dialog,
-  plan_for_window_close,
-  wait_for_modal_dialog,
-  wait_for_window_close,
-} = ChromeUtils.import("resource://testing-common/mozmill/WindowHelpers.jsm");
-
-var { MailServices } = ChromeUtils.import(
-  "resource:///modules/MailServices.jsm"
-);
-
-var defaultIdentity;
-
-function setupModule(module) {
-  defaultIdentity = MailServices.accounts.defaultAccount.defaultIdentity;
-}
-
-/**
- * Check that the archive options button is enabled or disabled appropriately.
- *
- * @param amc          the account options controller
- * @param aAccountKey  key of the account the check
- * @param isEnabled    true if the button should be enabled, false otherwise
- */
-function subtest_check_archive_options_enabled(amc, aAccountKey, isEnabled) {
-  let accountRow = get_account_tree_row(aAccountKey, "am-copies.xhtml", amc);
-  click_account_tree_row(amc, accountRow);
-
-  let iframe = amc.window.document.getElementById("contentFrame");
-  let button = iframe.contentDocument.getElementById("archiveHierarchyButton");
-
-  assert_equals(button.disabled, !isEnabled);
-}
-
-function test_archive_options_enabled() {
-  let defaultAccount = MailServices.accounts.defaultAccount;
-  // First, create an IMAP server
-  let imapServer = MailServices.accounts
-    .createIncomingServer("nobody", "example.com", "imap")
-    .QueryInterface(Ci.nsIImapIncomingServer);
-
-  let identity = MailServices.accounts.createIdentity();
-  identity.email = "tinderbox@example.com";
-
-  let account = MailServices.accounts.createAccount();
-  account.incomingServer = imapServer;
-  account.addIdentity(identity);
-
-  // Then test that the archive options button is enabled/disabled appropriately
-
-  // Let the default identity archive to our IMAP folder, to ensure that the
-  // archive folder's server is used to determine the enabled/disabled state
-  // of the "archive options" button, *not* the incoming server for that
-  // identity.
-  defaultIdentity.archiveFolder = imapServer.rootFolder.URI;
-
-  imapServer.isGMailServer = false;
-  open_advanced_settings(function(amc) {
-    subtest_check_archive_options_enabled(amc, account.key, true);
-  });
-  open_advanced_settings(function(amc) {
-    subtest_check_archive_options_enabled(amc, defaultAccount.key, true);
-  });
-
-  imapServer.isGMailServer = true;
-  open_advanced_settings(function(amc) {
-    subtest_check_archive_options_enabled(amc, account.key, false);
-  });
-  open_advanced_settings(function(amc) {
-    subtest_check_archive_options_enabled(amc, defaultAccount.key, false);
-  });
-
-  MailServices.accounts.removeAccount(account);
-}
-
-function subtest_initial_state(identity) {
-  plan_for_modal_dialog("Mailnews:archiveOptions", function(ac) {
-    assert_equals(
-      ac.e("archiveGranularity").selectedIndex,
-      identity.archiveGranularity
-    );
-    assert_equals(
-      ac.e("archiveKeepFolderStructure").checked,
-      identity.archiveKeepFolderStructure
-    );
-  });
-  mc.window.openDialog(
-    "chrome://messenger/content/am-archiveoptions.xhtml",
-    "",
-    "centerscreen,chrome,modal,titlebar,resizable=yes",
-    identity
-  );
-  wait_for_modal_dialog("Mailnews:archiveOptions");
-}
-
-function test_open_archive_options() {
-  for (let granularity = 0; granularity < 3; granularity++) {
-    defaultIdentity.archiveGranularity = granularity;
-    for (let kfs = 0; kfs < 2; kfs++) {
-      defaultIdentity.archiveKeepFolderStructure = kfs;
-      subtest_initial_state(defaultIdentity);
-    }
-  }
-}
-
-function subtest_save_state(identity, granularity, kfs) {
-  plan_for_modal_dialog("Mailnews:archiveOptions", function(ac) {
-    ac.e("archiveGranularity").selectedIndex = granularity;
-    ac.e("archiveKeepFolderStructure").checked = kfs;
-    ac.keypress(null, "VK_RETURN", {});
-    ac.window.document.querySelector("dialog").acceptDialog();
-  });
-  mc.window.openDialog(
-    "chrome://messenger/content/am-archiveoptions.xhtml",
-    "",
-    "centerscreen,chrome,modal,titlebar,resizable=yes",
-    identity
-  );
-  wait_for_modal_dialog("Mailnews:archiveOptions");
-}
-
-function test_save_archive_options() {
-  defaultIdentity.archiveGranularity = 0;
-  defaultIdentity.archiveKeepFolderStructure = false;
-  subtest_save_state(defaultIdentity, 1, true);
-
-  assert_equals(defaultIdentity.archiveGranularity, 1);
-  assert_equals(defaultIdentity.archiveKeepFolderStructure, true);
-}
-
-function subtest_check_archive_enabled(amc, archiveEnabled) {
-  defaultIdentity.archiveEnabled = archiveEnabled;
-
-  click_account_tree_row(amc, 2);
-
-  let iframe = amc.window.document.getElementById("contentFrame");
-  let checkbox = iframe.contentDocument.getElementById(
-    "identity.archiveEnabled"
-  );
-
-  assert_equals(checkbox.checked, archiveEnabled);
-}
-
-function test_archive_enabled() {
-  open_advanced_settings(function(amc) {
-    subtest_check_archive_enabled(amc, true);
-  });
-
-  open_advanced_settings(function(amc) {
-    subtest_check_archive_enabled(amc, false);
-  });
-}
-
-function subtest_disable_archive(amc) {
-  defaultIdentity.archiveEnabled = true;
-  click_account_tree_row(amc, 2);
-
-  let iframe = amc.window.document.getElementById("contentFrame");
-  let checkbox = iframe.contentDocument.getElementById(
-    "identity.archiveEnabled"
-  );
-
-  assert_true(checkbox.checked);
-  assert_false(checkbox.disabled);
-  amc.click(new elib.Elem(checkbox));
-  utils.waitFor(
-    () => !checkbox.checked,
-    "Archive checkbox didn't toggle to unchecked"
-  );
-  plan_for_window_close(amc);
-  amc.window.document.getElementById("accountManager").acceptDialog();
-  wait_for_window_close();
-
-  assert_false(defaultIdentity.archiveEnabled);
-}
-
-function test_disable_archive() {
-  open_advanced_settings(subtest_disable_archive);
-}
-// Disable test on Windows since for some yet unknown reason clicking the checkbox
-// doesn't have the desired result. See bug 1461173 for details.
-test_disable_archive.EXCLUDED_PLATFORMS = ["winnt"];

deleted file mode 100644
--- a/mail/test/mozmill/account/test-mail-account-setup-wizard.js
+++ /dev/null
@@ -1,294 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-var elib = ChromeUtils.import(
-  "chrome://mozmill/content/modules/elementslib.jsm"
-);
-
-var {
-  open_advanced_settings_from_account_wizard,
-  open_mail_account_setup_wizard,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/AccountManagerHelpers.jsm"
-);
-var { assert_equals, mc } = ChromeUtils.import(
-  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
-);
-var { input_value, delete_all_existing } = ChromeUtils.import(
-  "resource://testing-common/mozmill/KeyboardHelpers.jsm"
-);
-var { gMockPromptService } = ChromeUtils.import(
-  "resource://testing-common/mozmill/PromptHelpers.jsm"
-);
-
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-var { MailServices } = ChromeUtils.import(
-  "resource:///modules/MailServices.jsm"
-);
-
-var user = {
-  name: "Yamato Nadeshiko",
-  email: "yamato.nadeshiko@example.com",
-  password: "abc12345",
-  incomingHost: "testin.example.com",
-  outgoingHost: "testout.example.com",
-};
-
-// Remove an account in the Account Manager, but not via the UI.
-function remove_account_internal(amc, aAccount, aOutgoing) {
-  let win = amc.window;
-
-  try {
-    // Remove the account and incoming server
-    let serverId = aAccount.incomingServer.serverURI;
-    MailServices.accounts.removeAccount(aAccount);
-    aAccount = null;
-    if (serverId in win.accountArray) {
-      delete win.accountArray[serverId];
-    }
-    win.selectServer(null, null);
-
-    // Remove the outgoing server
-    let smtpKey = aOutgoing.key;
-    MailServices.smtp.deleteServer(aOutgoing);
-    win.replaceWithDefaultSmtpServer(smtpKey);
-  } catch (ex) {
-    throw new Error("failure to remove account: " + ex + "\n");
-  }
-}
-
-function test_mail_account_setup() {
-  // Set the pref to load a local autoconfig file.
-  let pref_name = "mailnews.auto_config_url";
-  let url = collector.addHttpResource("../account/xml", "autoconfig");
-  Services.prefs.setCharPref(pref_name, url);
-
-  // Force .com MIME-Type to text/xml
-  collector.httpd.registerContentType("com", "text/xml");
-
-  open_mail_account_setup_wizard(function(awc) {
-    // Input user's account information
-    awc.click(awc.eid("realname"));
-    if (awc.e("realname").value) {
-      // If any realname is already filled, clear it out, we have our own.
-      delete_all_existing(awc, awc.eid("realname"));
-    }
-    input_value(awc, user.name);
-    awc.keypress(null, "VK_TAB", {});
-    input_value(awc, user.email);
-    awc.keypress(null, "VK_TAB", {});
-    input_value(awc, user.password);
-
-    // Load the autoconfig file from http://localhost:433**/autoconfig/example.com
-    awc.click(awc.eid("next_button"));
-
-    // XXX: This should probably use a notification, once we fix bug 561143.
-    awc.waitFor(
-      () => awc.window.gEmailConfigWizard._currentConfig != null,
-      "Timeout waiting for current config to become non-null",
-      8000,
-      600
-    );
-
-    // Register the prompt service to handle the confirm() dialog
-    gMockPromptService.register();
-    gMockPromptService.returnValue = true;
-
-    // Open the advanced settings (Account Manager) to create the account
-    // immediately.  We use an invalid email/password so the setup will fail
-    // anyway.
-    open_advanced_settings_from_account_wizard(subtest_verify_account, awc);
-
-    let promptState = gMockPromptService.promptState;
-    assert_equals("confirm", promptState.method);
-
-    // Clean up
-    gMockPromptService.unregister();
-    Services.prefs.clearUserPref(pref_name);
-  });
-}
-
-function subtest_verify_account(amc) {
-  amc.waitFor(
-    () => amc.window.currentAccount != null,
-    "Timeout waiting for currentAccount to become non-null"
-  );
-  let account = amc.window.currentAccount;
-  let identity = account.defaultIdentity;
-  let incoming = account.incomingServer;
-  let outgoing = MailServices.smtp.getServerByKey(identity.smtpServerKey);
-
-  let config = {
-    "incoming server username": {
-      actual: incoming.username,
-      expected: user.email.split("@")[0],
-    },
-    "outgoing server username": {
-      actual: outgoing.username,
-      expected: user.email,
-    },
-    "incoming server hostname": {
-      // Note: N in the hostName is uppercase
-      actual: incoming.hostName,
-      expected: user.incomingHost,
-    },
-    "outgoing server hostname": {
-      // And this is lowercase
-      actual: outgoing.hostname,
-      expected: user.outgoingHost,
-    },
-    "user real name": { actual: identity.fullName, expected: user.name },
-    "user email address": { actual: identity.email, expected: user.email },
-  };
-
-  try {
-    for (let i in config) {
-      if (config[i].actual != config[i].expected) {
-        throw new Error(
-          "Configured " +
-            i +
-            " is " +
-            config[i].actual +
-            ". It should be " +
-            config[i].expected +
-            "."
-        );
-      }
-    }
-  } finally {
-    remove_account_internal(amc, account, outgoing);
-  }
-}
-
-/**
- * Make sure that we don't re-set the information we get from the config
- * file if the password is incorrect.
- */
-function test_bad_password_uses_old_settings() {
-  // Set the pref to load a local autoconfig file, that will fetch the
-  // ../account/xml/example.com which contains the settings for the
-  // @example.com email account (see the 'user' object).
-  let pref_name = "mailnews.auto_config_url";
-  let url = collector.addHttpResource("../account/xml", "autoconfig");
-  Services.prefs.setCharPref(pref_name, url);
-
-  // Force .com MIME-Type to text/xml
-  collector.httpd.registerContentType("com", "text/xml");
-
-  mc.sleep(0);
-  open_mail_account_setup_wizard(function(awc) {
-    try {
-      // Input user's account information
-      awc.click(awc.eid("realname"));
-      if (awc.e("realname").value) {
-        // If any realname is already filled, clear it out, we have our own.
-        delete_all_existing(awc, awc.eid("realname"));
-      }
-      input_value(awc, user.name);
-      awc.keypress(null, "VK_TAB", {});
-      input_value(awc, user.email);
-      awc.keypress(null, "VK_TAB", {});
-      input_value(awc, user.password);
-
-      // Load the autoconfig file from http://localhost:433**/autoconfig/example.com
-      awc.e("next_button").click();
-
-      awc.waitFor(
-        function() {
-          return !this.disabled && !this.hidden;
-        },
-        "Timeout waiting for create button to be visible and active",
-        8000,
-        600,
-        awc.e("create_button")
-      );
-      awc.e("create_button").click();
-
-      awc.waitFor(
-        function() {
-          return !this.disabled;
-        },
-        "Timeout waiting for create button to be visible and active",
-        8000,
-        600,
-        awc.e("create_button")
-      );
-      awc.e("create_button").click();
-      awc.e("manual-edit_button").click();
-
-      // Make sure all the values are the same as in the user object.
-      awc.sleep(1000);
-      assert_equals(
-        awc.e("outgoing_hostname").value,
-        user.outgoingHost,
-        "Outgoing server changed!"
-      );
-      assert_equals(
-        awc.e("incoming_hostname").value,
-        user.incomingHost,
-        "incoming server changed!"
-      );
-    } finally {
-      // Clean up
-      Services.prefs.clearUserPref(pref_name);
-      awc.e("cancel_button").click();
-    }
-  });
-}
-
-function test_remember_password() {
-  remember_password_test(true);
-  remember_password_test(false);
-}
-
-/**
- * Test remember_password checkbox behavior with
- * signon.rememberSignons set to "aPrefValue"
- */
-function remember_password_test(aPrefValue) {
-  // save the pref for backup purpose
-  let rememberSignons_pref_save = Services.prefs.getBoolPref(
-    "signon.rememberSignons",
-    true
-  );
-
-  Services.prefs.setBoolPref("signon.rememberSignons", aPrefValue);
-
-  // without this, it breaks the test, don't know why
-  mc.sleep(0);
-  open_mail_account_setup_wizard(function(awc) {
-    try {
-      let password = new elementslib.ID(awc.window.document, "password");
-      let rememberPassword = new elementslib.ID(
-        awc.window.document,
-        "remember_password"
-      );
-
-      // type something in the password field
-      awc.e("password").focus();
-      input_value(awc, "testing");
-
-      awc.assertProperty(rememberPassword, "disabled", !aPrefValue);
-      if (aPrefValue) {
-        awc.assertChecked(rememberPassword);
-      } else {
-        awc.assertNotChecked(rememberPassword);
-      }
-
-      // empty the password field
-      delete_all_existing(awc, password);
-
-      // restore the saved signon.rememberSignons value
-      Services.prefs.setBoolPref(
-        "signon.rememberSignons",
-        rememberSignons_pref_save
-      );
-    } finally {
-      // close the wizard
-      awc.e("cancel_button").click();
-    }
-  });
-}

deleted file mode 100644
--- a/mail/test/mozmill/account/test-retest-config.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-var elib = ChromeUtils.import(
-  "chrome://mozmill/content/modules/elementslib.jsm"
-);
-
-var { open_mail_account_setup_wizard } = ChromeUtils.import(
-  "resource://testing-common/mozmill/AccountManagerHelpers.jsm"
-);
-var { assert_true, mc } = ChromeUtils.import(
-  "resource://testing-common/mozmill/FolderDisplayHelpers.jsm"
-);
-var { input_value, delete_all_existing } = ChromeUtils.import(
-  "resource://testing-common/mozmill/KeyboardHelpers.jsm"
-);
-var { close_window } = ChromeUtils.import(
-  "resource://testing-common/mozmill/WindowHelpers.jsm"
-);
-
-var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-var user = {
-  name: "test",
-  email: "test@momo.invalid",
-  altEmail: "test2@momo.invalid",
-};
-
-function setupModule(module) {
-  Services.prefs.setCharPref("mail.wizard.logging.dump", "All");
-
-  let url = collector.addHttpResource("../account/xml", "accountconfig");
-  Services.prefs.setCharPref("mailnews.auto_config_url", url);
-  collector.httpd.registerContentType("invalid", "text/xml");
-}
-
-function tearDownModule(module) {
-  Services.prefs.clearUserPref("mailnews.auto_config_url");
-  Services.prefs.clearUserPref("mail.wizard.logging.dump");
-}
-
-function test_re_test_config() {
-  // Opening multiple windows in the same run seems to require letting the stack
-  // unwind before opening the next one, so do that here.
-  mc.sleep(0);
-  open_mail_account_setup_wizard(function(awc) {
-    // Input user's account information
-    awc.click(awc.eid("realname"));
-    if (awc.e("realname").value) {
-      // If any realname is already filled, clear it out, we have our own.
-      delete_all_existing(awc, awc.eid("realname"));
-    }
-    input_value(awc, user.name);
-    awc.keypress(null, "VK_TAB", {});
-    input_value(awc, user.email);
-
-    // Click "continue" button
-    awc.e("next_button").click();
-
-    // Wait for 'edit' button to be enabled
-    awc.waitFor(
-      function() {
-        return !this.disabled && !this.hidden;
-      },
-      "Timeout waiting for edit button to be enabled",
-      8000,
-      600,
-      awc.e("create_button")
-    );
-
-    awc.e("manual-edit_button").click();
-
-    // Click "re-test" button
-    awc.e("half-manual-test_button").click();
-
-    awc.waitFor(
-      function() {
-        return !this.disabled;
-      },
-      "Timeout waiting for re-test button to be enabled",
-      20000,
-      600,
-      awc.e("half-manual-test_button")
-    );
-
-    // There used to be a "start over" button (line commented out below). Now just
-    // changing the value of the email field does the trick.
-    awc.e("realname").focus();
-    awc.keypress(null, "VK_TAB", {});
-    awc.e("email").focus();
-    input_value(awc, user.altEmail);
-    awc.keypress(null, "VK_TAB", {});
-
-    // Wait for the "continue" button to be back, which means we're back to the
-    // original state.
-    awc.waitFor(
-      function() {
-        return !this.hidden;
-      },
-      "Timeout waiting for continue button to be visible",
-      20000,
-      600,
-      awc.e("next_button")
-    );
-
-    awc.e("next_button").click();
-
-    // Previously, we'd switched to the manual editing state. Now we've started
-    // over, we should make sure the information is presented back in its original
-    // "automatic" mode.
-    assert_true(
-      awc.e("manual-edit_area").hidden,
-      "We're not back to the original state!"
-    );
-
-    close_window(awc);
-  });
-}

deleted file mode 100644
--- a/mail/test/mozmill/account/xml/example.com
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<clientConfig>
-  <emailProvider id="example.com">
-    <domain>example.com</domain>
-    <displayName>Example</displayName>
-    <displayShortName>Example</displayShortName>
-    <incomingServer type="pop3">
-      <hostname>testin.%EMAILDOMAIN%</hostname>
-      <port>995</port>
-      <socketType>SSL</socketType>
-      <username>%EMAILLOCALPART%</username>
-      <authentication>plain</authentication>
-    </incomingServer>
-    <outgoingServer type="smtp">
-      <hostname>testout.%EMAILDOMAIN%</hostname>
-      <port>587</port>
-      <socketType>STARTTLS</socketType>
-      <username>%EMAILADDRESS%</username>
-      <authentication>plain</authentication>
-      <addThisServer>true</addThisServer>
-      <useGlobalPreferredServer>false</useGlobalPreferredServer>
-    </outgoingServer>
-  </emailProvider>
-</clientConfig>

deleted file mode 100644
--- a/mail/test/mozmill/account/xml/momo.invalid
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<clientConfig version="1.1">
-  <emailProvider id="momo.invalid">
-    <domain>momo.invalid</domain>
-    <displayName>MoMo Mail</displayName>
-    <displayShortName>Yahoo</displayShortName>
-    <incomingServer type="pop3">
-      <hostname>pop.mail.momo.invalid</hostname>
-      <port>995</port>
-      <socketType>SSL</socketType>
-      <username>%EMAILLOCALPART%</username>
-      <authentication>password-cleartext</authentication>
-    </incomingServer>
-    <incomingServer type="imap">
-      <hostname>imap.mail.momo.invalid</hostname>
-      <port>993</port>
-      <socketType>SSL</socketType>
-      <username>%EMAILLOCALPART%</username>
-      <authentication>password-cleartext</authentication>
-    </incomingServer>
-    <outgoingServer type="smtp">
-      <hostname>smtp.mail.momo.invalid</hostname>
-      <port>465</port>
-      <socketType>SSL</socketType>
-      <username>%EMAILLOCALPART%</username>
-      <authentication>password-cleartext</authentication>
-    </outgoingServer>
-  </emailProvider>
-</clientConfig>

deleted file mode 100644
--- a/mail/test/mozmill/addrbook/test-address-book-panes.js
+++ /dev/null
@@ -1,136 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * Tests for the address book.
- */
-
-"use strict";
-
-var {
-  close_address_book_window,
-  open_address_book_window,
-} = ChromeUtils.import(
-  "resource://testing-common/mozmill/AddressBookHelpers.jsm"
-);
-
-var abController;
-
-function setupModule(module) {
-  // Open the address book main window
-  abController = open_address_book_window();
-}
-
-function teardownModule(module) {
-  // Make sure the panes are all visible now that we're
-  // done these tests.
-  toggle_directory_pane();
-  toggle_contact_pane();
-
-  assert_directory_pane_visibility(true);
-  assert_contact_pane_visibility(true);
-
-  close_address_book_window(abController);
-}
-
-/**
- * Helper function to toggle a pane.
- *
- * @param splitterId the id of the splitter to toggle
- */
-function _help_toggle_pane(splitterId) {
-  abController.window.togglePaneSplitter(splitterId);
-}
-
-/**
- * Helper function to check consistency of a pane's state.
- *
- * @param paneId the id of the pane in question
- * @param menuitemId the id of the menuitem corresponding to the pane
- * @param visible true if the pane should be visible, false otherwise
- */
-function _help_assert_pane_visibility(paneId, menuitemId, visible) {
-  if (abController.e(paneId).collapsed == visible) {
-    throw new Error(
-      paneId + " pane should be " + (visible ? "visible" : "hidden")
-    );
-  }
-
-  abController.window.InitViewLayoutMenuPopup();
-  if (
-    (abController.e(menuitemId).getAttribute("checked") == "true") !=
-    visible
-  ) {
-    throw new Error(
-      menuitemId + " menuitem should be " + (visible ? "checked" : "unchecked")
-    );
-  }
-}
-
-/**
- * Toggle the directory pane.
- */
-function toggle_directory_pane() {
-  _help_toggle_pane("dirTree-splitter");
-}
-
-/**
- * Toggle the contact pane.
- */
-function toggle_contact_pane() {
-  _help_toggle_pane("results-splitter");
-}
-
-/**
- * Check that the directory pane is visible or hidden.
- *
- * @param visible true if the pane should be visible, false otherwise
- */
-function assert_directory_pane_visibility(visible) {
-  _help_assert_pane_visibility("dirTreeBox", "menu_showDirectoryPane", visible);
-}
-
-/**
- * Check that the contact pane is visible or hidden.
- *
- * @param visible true if the pane should be visible, false otherwise
- */
-function assert_contact_pane_visibility(visible) {
-  _help_assert_pane_visibility(
-    "CardViewOuterBox",
-    "menu_showCardPane",
-    visible
-  );
-}
-
-function test_hide_directory_pane() {
-  toggle_directory_pane();
-  assert_directory_pane_visibility(false);
-}
-
-function test_show_directory_pane() {
-  toggle_directory_pane();
-  assert_directory_pane_visibility(true);
-}
-
-function test_hide_contact_pane() {
-  toggle_contact_pane();
-  assert_contact_pane_visibility(false);
-}
-
-function test_show_contact_pane() {
-  toggle_contact_pane();
-  assert_contact_pane_visibility(true);
-}
-
-function test_persist_panes() {
-  toggle_directory_pane();
-  toggle_contact_pane();
-
-  close_address_book_window(abController);
-  abController = open_address_book_window();
-
-  assert_directory_pane_visibility(false);
-  assert_contact_pane_visibility(false);
-}